bitkeeper revision 1.1159.212.21 (41eced4bEkAMraEcwbENPomgklaetA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 18 Jan 2005 11:04:43 +0000 (11:04 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 18 Jan 2005 11:04:43 +0000 (11:04 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c

index ec691d5384922a8832f683c5d8ce748ac37c28b7,05b043c1751e1a46f108421841a9095b2e754bef..b75b6169a759cf64ea1d69e25dee163c7c2aa09e
  
  #include "common.h"
  #include <asm-xen/balloon.h>
 +#include <asm-xen/evtchn.h>
  
+ static void netif_idx_release(u16 pending_idx);
  static void netif_page_release(struct page *page);
- static void netif_skb_release(struct sk_buff *skb);
  static void make_tx_response(netif_t *netif, 
                               u16      id,
                               s8       st);